[automerger skipped] Merge changes Iee5024b8,Ic8afc2eb into udc-dev am: 41c6253412 am: 2f04614141 -s ours am: 29799c8849 -s ours am: 81cfa5ec91 -s ours
am skip reason: Merged-In Iee5024b8f13771bc98a39a20e5f96a89a4c79b4e with SHA-1 a18cd7c08b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23436583
Change-Id: Ia10dff545d9eb673cfff7a2c532e45d337944e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: