Merge changes from topic "am-8d585b21f95b48868b7c816b4aa4a7de" into...

Merge changes from topic "am-8d585b21f95b48868b7c816b4aa4a7de" into udc-qpr-dev-plus-aosp am: c69749d8

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



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