Merge changes from topic "am-29abd21d17dc450a9363f42b5b9f7972" into...

Merge changes from topic "am-29abd21d17dc450a9363f42b5b9f7972" into udc-qpr-dev-plus-aosp am: 1f9e1a9f -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/+/24109874



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