Merge changes from topic "am-3bf5214e91ab4a46a09647c3fac945a8" into...

Merge changes from topic "am-3bf5214e91ab4a46a09647c3fac945a8" into android12-tests-dev am: 4e3999ba -s ours

am skip reason: Merged-In I3707d883d0daa4ffd2baa9bd69aebf4bf9ddef4e with SHA-1 82fa4811 is already in history

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



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