Merge "MediaPlayer2: remove hidden API AudioAttributes.FLATTEN_TAGS usage"