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

Merge changes from topic "am-dbd748777ce1427b9574bc82b9b5d98f" into udc-qpr-dev-plus-aosp am: fe08f06c

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



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