Merge changes from topic "am-7e5bbb7d22d5483a88e097cac4d646e6" into...

Merge changes from topic "am-7e5bbb7d22d5483a88e097cac4d646e6" into udc-qpr-dev-plus-aosp am: 8ffc4a9f -s ours

am skip reason: Merged-In I66a660c091c90a957a0fd1e144c013840db3f47e with SHA-1 dbdfadc2 is already in history

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



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