Merge changes from topic "am-a2e1a139a4c94b919028fb7cd07d2d9b" into main am: c5fb9af6 -s ours

am skip reason: Merged-In I8084b48b4a181e87bd151bc2870eddad36ae3a0b with SHA-1 6d513127 is already in history

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



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