Merge changes from topic "am-99462b5969e443708da00682b9255f8c" into...

Merge changes from topic "am-99462b5969e443708da00682b9255f8c" into udc-qpr-dev-plus-aosp am: 8eb9e74e -s ours

am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 552ec325 is already in history

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



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