Merge changes from topic "am-87109762bfb34e9f9053dc0b7de503b0" into...

Merge changes from topic "am-87109762bfb34e9f9053dc0b7de503b0" into udc-qpr-dev-plus-aosp am: 5870ecbf

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



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