Merge changes from topic "am-b7175fd35b0a4f71864ad398fc938238" into...

Merge changes from topic "am-b7175fd35b0a4f71864ad398fc938238" into udc-qpr-dev-plus-aosp am: aa51c988 -s ours

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

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



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