Merge "resolve merge conflicts of c94e810c to...

Merge "resolve merge conflicts of c94e810c to rvc-dev-plus-aosp" into rvc-dev-plus-aosp am: a3d8ee34 am: 8d592fae am: e96992ff

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316526

Change-Id: I71cd6bf1854ae33d727f57c63b16de61656622e5