[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-074a4079410e45ab88bda7ff824d0b06" into udc-d1-dev-plus-aosp am: 0594d9d1 -s ours am: 1abd3d93 -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/+/24559329



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