Merge changes from topic "fix-b-281850726-remove-audio-attributes-int" am: 45137cc7

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



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