[automerger skipped] Merge changes Ic93dd0c7,Ibabbb998,I3a26f901,I9708086f...

[automerger skipped] Merge changes Ic93dd0c7,Ibabbb998,I3a26f901,I9708086f into main am: da30ff98 -s ours am: 24136efd -s ours am: 7767c741 -s ours

am skip reason: Merged-In I4ee46120c825c7e1b7a394e4f20cd5c710a63bc1 with SHA-1 4c88e716 is already in history

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



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