[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: 69f9f532 -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: If2e8071e51b7d3395f2c92f76c6394c677e9c47f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>