resolve merge conflicts of 525ed1c2 to...

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

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

Change-Id: Ic8bb64248051e1c39469f6e585dafec7e03d66c0