[automerger skipped] Merge changes I2d16e716,Idc83299a into main am: bebd48200f -s ours am: 29f4a23a40 -s ours

am skip reason: Merged-In I2d16e716d8b5945762bc0cfd0b278c5c00ca8f80 with SHA-1 27a95bd52d is already in history

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

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