[automerger skipped] Merge changes I482c2a73,Id81f03fa,I55264110 into...

[automerger skipped] Merge changes I482c2a73,Id81f03fa,I55264110 into android15-tests-dev am: 0826325e -s ours am: 410aeceb -s ours

am skip reason: Merged-In I482c2a731f95b7f8e9c3e4ed4ce7ac4d0aae94df with SHA-1 9dbb416f is already in history

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



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