Merge changes from topic "am-0f8ababda59d456f8ac0de10deb0ac38" into...

Merge changes from topic "am-0f8ababda59d456f8ac0de10deb0ac38" into udc-qpr-dev-plus-aosp am: 49bc1ecc -s ours

am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 658ed370 is already in history

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



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