Merge changes from topic "am-51e102ef8a5d4bb4a6e79567d1627d08" into...

Merge changes from topic "am-51e102ef8a5d4bb4a6e79567d1627d08" into udc-qpr-dev-plus-aosp am: 6a63c14e -s ours

am skip reason: Merged-In I7b5190de3b320f71aff82b3a465dac4e2c4e96a6 with SHA-1 0146f4b3 is already in history

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



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