[automerger skipped] Merge changes I7a7e6759,Ifce10352 into udc-dev-plus-aosp...

[automerger skipped] Merge changes I7a7e6759,Ifce10352 into udc-dev-plus-aosp am: a199146b am: d0f9d6c3 am: 0dd28d8a -s ours

am skip reason: Merged-In I7a7e67599c55c42ebbf513f3b7736e7831c94741 with SHA-1 52d599cf is already in history

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



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