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

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

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



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