Merge changes from topic "am-aa42a2b75f904f81a21738b694b4f770" into...

Merge changes from topic "am-aa42a2b75f904f81a21738b694b4f770" into udc-qpr-dev-plus-aosp am: ce3a11e3

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



Change-Id: Id8659e6ef3c84641b44bf19d8674da56c30c1b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>