[automerger skipped] DO NOT MERGE - Merge Android 13 am: be48918b -s ours...

[automerger skipped] DO NOT MERGE - Merge Android 13 am: be48918b -s ours am: 49e8b8f0 -s ours am: cc042762 -s ours am: 2d94b93b -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: I3ee95f4c4c855354c0f935c585530cd10cc7ecfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>