resolve merge conflicts of 525ed1c2 to...

resolve merge conflicts of 525ed1c2 to rvc-dev-plus-aosp am: be053b7e

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

Change-Id: I3d89978f6475bd83f0e4c26d37be603bde1987ce