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

[automerger skipped] Merge changes Ie865aba7,Ic51a9ceb into udc-dev am: 85b959f4 am: da088f2e am: 2f91a8d3 am: 014e93e2 -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: Ifb5981fb06cd7dbf106243dc3fe53075612adb48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>