Merge changes from topic "am-92e81bba1fcb4c0ab0fd46e8caab0fb7" into...

Merge changes from topic "am-92e81bba1fcb4c0ab0fd46e8caab0fb7" into udc-qpr-dev-plus-aosp am: d8eff329 -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: If252ccd6f9d2acc9f3425c4ecf2f3d2137ce572c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>