Merge changes from topic "am-18c4e396a9af4c0caf8ca8dae855523c" into...

Merge changes from topic "am-18c4e396a9af4c0caf8ca8dae855523c" into udc-d1-dev-plus-aosp am: 0c213877 -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/+/24343150



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