Merge "Finish stubbing out MediaControllerCompat APIs" into lmp-mr1-dev