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

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

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