[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "fix-b-281850726-remove-audio-attributes-int" am: 45137cc7 am: 3f8cd638 am: ec3b54ff -s ours

am skip reason: Merged-In If1ff43110c54613c5c29b42a2dc3e5d832708c28 with SHA-1 f094be27 is already in history

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



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