[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-6f6d24a834fd42e8956e81d5ce7652d5" into main am: e5b5d6a8 -s ours am: 7ca142e1 -s ours

am skip reason: Merged-In Icf734efb07c28f469da93c04285457bccbfc2a28 with SHA-1 9da3fea9 is already in history

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



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