Merge "MediaPlayer2: add doc referencing androidx"