Merge changes from topic "am-9452c6fc0aaa4f649d955bebf50de5b6" into...

Merge changes from topic "am-9452c6fc0aaa4f649d955bebf50de5b6" into udc-qpr-dev-plus-aosp am: 35c11c3c -s ours

am skip reason: Merged-In I8f25d7a5e47890a0496af023149717e1df482f98 with SHA-1 daed0a71 is already in history

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



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