[automerger skipped] Merge changes I5b2973c1,Iaa535450 into udc-dev-plus-aosp...

[automerger skipped] Merge changes I5b2973c1,Iaa535450 into udc-dev-plus-aosp am: 751f9828 am: 8f66a669 am: 14216fd4 -s ours

am skip reason: Merged-In I5b2973c12b3d36663fadd2e5ed362602785e1447 with SHA-1 59867e43 is already in history

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



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