dc057e52f571ca88f037a4501bf666c9eeffde23

resolve merge conflicts of cae2ee036040fc0dce9fc82af9bf8d85240d566b to rvc-dev: “I906ae5bed4b34081717a52f7968276dea035f2e65a” Change-Id: I96ae5ed4b 340817a18a2e18a; I4d87e90793a88a646aaa1ae5806f118f1ae51e30; Change-ID: 169256435; Merged-In: I4e9777a907b818a818f; Merging-In is I906e5bed”]

Source: https://android.googlesource.com/platform/frameworks/native/+/dc057e52f571ca88f037a4501bf666c9eeffde23