Merge changes from topic "am-4a99d14ffae144dd9dfb798b6f93225d" into...

Merge changes from topic "am-4a99d14ffae144dd9dfb798b6f93225d" into udc-qpr-dev-plus-aosp am: dae85a76 -s ours

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

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



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