Merge changes from topic "am-92def43caac0462a8e67863e0310a4b5" into...

Merge changes from topic "am-92def43caac0462a8e67863e0310a4b5" into android13-tests-dev am: 5355dd12 -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: Ic06ee2b3a88ffcbe98b3049d0c122e0ddff59950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>