Merge changes from topic "am-174e6508b7ee4ebb8558af5408458c7e" into...

Merge changes from topic "am-174e6508b7ee4ebb8558af5408458c7e" into udc-qpr-dev-plus-aosp am: 4f5c8782

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



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