[automerger skipped] Merge changes If5f4a7b4,Ie58b6947 into udc-dev am: 7c41bf2e -s ours

am skip reason: Merged-In If5f4a7b44812a6a9b2fcc5ba423de14596b717f2 with SHA-1 36cface1 is already in history

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



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