[automerger skipped] Merge "Remove AudioAttributesInternal and...

[automerger skipped] Merge "Remove AudioAttributesInternal and media.AudioFlag" into udc-dev-plus-aosp am: 86f09fdd am: ed148e34 -s ours am: 322e8c18 -s ours

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

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



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