[automerger skipped] Merge changes I5bab7728,Ie386672c,I04940599 into udc-dev...

[automerger skipped] Merge changes I5bab7728,Ie386672c,I04940599 into udc-dev am: 6a6c1dc7 am: 66890957 -s ours

am skip reason: Merged-In I5bab77281992d0e826427e458025103500fc0869 with SHA-1 f760f7f1 is already in history

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



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