resolve merge conflicts of 525ed1c2 to...

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

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

Change-Id: I7c53db5f3c12e04df762e89b497bb2b45111876e