Merge "Merge "Make MediaStyle#setRemotePlayback public" into udc-dev am: 506535c339 am: 9dae55eb96"