Merge "MediaRouter: Make MediaControllerCompat.playFromUri() work" into mnc-ub-dev