Merge changes from topic "am-86712fce83e749f2a5f4de86e3699f53" into...

Merge changes from topic "am-86712fce83e749f2a5f4de86e3699f53" into udc-qpr-dev-plus-aosp am: 8dabc3cc

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



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