[automerger skipped] Merge changes Ie865aba7,Ic51a9ceb into udc-dev am: 85b959f478 am: a26040cd27 -s ours
am skip reason: Merged-In Ie865aba7325e3442c6610ef962fce3a3a65f0b70 with SHA-1 a1c1f2e29f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24134363
Change-Id: I8782e419d65efca707c27e748d9ee075aa5654b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: