[automerger skipped] Merge changes Ide7d63a7,I9e075f29 into udc-dev am:...

[automerger skipped] Merge changes Ide7d63a7,I9e075f29 into udc-dev am: 1d870f1f am: 801fcb32 -s ours

am skip reason: Merged-In Ide7d63a75fed98aabe348821355356c77f00a9ec with SHA-1 d05732f1 is already in history

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



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