[automerger skipped] Merge changes Iec1011a9,I64249876,Icb348a4a,Ibd46b7de...

[automerger skipped] Merge changes Iec1011a9,I64249876,Icb348a4a,Ibd46b7de into udc-qpr-dev-plus-aosp am: bdf40f1d -s ours

am skip reason: Merged-In Iec1011a9f6dc9088c5254fd10ae27f526defd490 with SHA-1 4fd69011 is already in history

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



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