[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-931eac5fdc1f4b699aa5e30cca706273" into main am: 8d754eaf -s ours am: b14b6a62 -s ours

am skip reason: Merged-In I6f88b74ee5f50b86088c6e1c4cca374cfe85e444 with SHA-1 06047b9f is already in history

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



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