[automerger skipped] Merge changes Ia1929f4a,Ia292acc5,Idcb2bb99 into main am: 7e3b7e2e4d -s ours

am skip reason: Merged-In Ia1929f4a3c4a717733f2016816b5a784ba31e018 with SHA-1 f11041b0de is already in history

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

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