Merge changes from topic "am-91ff466061af4e168f5301a5b7f1f109" into...

Merge changes from topic "am-91ff466061af4e168f5301a5b7f1f109" into udc-qpr-dev-plus-aosp am: 0f3d9bdc -s ours

am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 39f57376 is already in history

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



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