[automerger skipped] Merge changes...

[automerger skipped] Merge changes Iae2b4e10,I0e97edf5,I69d529b6,I13c75cbd,I52f434be into main am: d8b9ed51 am: 813ceaef -s ours

am skip reason: Merged-In Iae2b4e10323b397b64cc59b9e1df4e6f418839cf with SHA-1 c9ad3c8d is already in history

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



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