Merge "Remove AudioAttributesInternal and media.AudioFlag" into udc-qpr-dev am: e941ddd49f

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

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