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