[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-2876cb49a01647d5b9d7e87219b708bf" into udc-dev am: 67b7ac80 -s ours am: 3ee9fb6b -s ours am: 7d4e76c6 -s ours am: e35f644f -s ours

am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 820fe895 is already in history

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



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