[automerger skipped] Merge changes Ie865aba7,Ic51a9ceb into udc-dev am:...

[automerger skipped] Merge changes Ie865aba7,Ic51a9ceb into udc-dev am: 85b959f4 am: 9a126ddc am: 6c182103 -s ours am: 01d563a0 -s ours

am skip reason: Merged-In Ie865aba7325e3442c6610ef962fce3a3a65f0b70 with SHA-1 e9c83eae is already in history

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



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