[automerger skipped] Merge changes from topic "bq-attach-media" into main am:...

[automerger skipped] Merge changes from topic "bq-attach-media" into main am: 636d8a60 am: f1e3f724 -s ours

am skip reason: Merged-In I5300086f7ae36d3b5e358e62e596001ecd32f572 with SHA-1 d8a822db is already in history

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



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