Merge changes from topic "am-53723217c4054f878b577ab8985c4313" into android13-tests-dev am: 8464b75fa8 -s ours

am skip reason: Merged-In I840068aa1ba5ea3b19b855347d45221875b773e9 with SHA-1 4d21ce0db8 is already in history

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

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