[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 87384c50 -s ours

am skip reason: Merged-In I85012b8b87e4c4ff98150f091a92721a3c7242b9 with SHA-1 210d52ea is already in history

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



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