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

Merge changes from topic "am-e7b34da0124d4dc98ffbc0896c4c2383" into udc-d1-dev-plus-aosp am: 5eaccd75 -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/+/24301239



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