[automerger skipped] Merge changes Iec1011a9,I64249876,Icb348a4a,Ibd46b7de,Ied45a5d7 into main am: 0381fe848c am: 80c1e0ce02 -s ours am: efe557d57e -s ours

am skip reason: Merged-In Iec1011a9f6dc9088c5254fd10ae27f526defd490 with SHA-1 12dcf8670e is already in history

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

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