Merge "Dont test MediaFormat.KEY_MAX_OUTPUT_CHANNEL_COUNT before Android T" into tm-dev