Merge changes from topic "bq-attach-media" into main am: 636d8a60

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



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