[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-b2bb95891fbb4d0a8ad6c6d09f2617c3" into android12L-tests-dev am: a04f7a1e -s ours am: 56287136 -s ours am: 8ca79932 -s ours

am skip reason: Merged-In Iba03d8b8c48351a8cc4f2ed3eb2451d649ad8cac with SHA-1 621a28ad is already in history

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



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