Merge changes from topic "am-c2dbbfa90b434a0fa6d3c670774e0882" into...

Merge changes from topic "am-c2dbbfa90b434a0fa6d3c670774e0882" into udc-d1-dev-plus-aosp am: 6e1e7d5f -s ours

am skip reason: Merged-In I4ef415437568ae165ac5a3153d18bd2e2ef1f808 with SHA-1 69f9efe5 is already in history

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



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