Merge changes from topic "am-324ad52af37444b2958831b802bf064f" into...

Merge changes from topic "am-324ad52af37444b2958831b802bf064f" into udc-d1-dev-plus-aosp am: e41800d9 -s ours

am skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 1c3d701c is already in history

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



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