[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-90e46d830fc648a6b2a77cf23504028f" into android12L-tests-dev am: e43f0449 -s ours am: de6d8a4d -s ours am: 77dba491 -s ours

am skip reason: Merged-In I55066cc1de8b820c24faccdfb469377c897e9808 with SHA-1 cf9526cf is already in history

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



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