Merge "MediaPlayerService: fix access of mPlayer in client am: 502c2f40 am:...

Merge "MediaPlayerService: fix access of mPlayer in client am: 502c2f40 am: bd7db202 am: 03fa6720 am: 263d5a2a am: 0844e1a3 am: e0f49635 am: 5cc9f878 am: 93ae1364 am: 50280c1b am: 1a1bb632 am: d8192c91 am: 6f7295a3 am: 830ecba3 am: ee04f896 am: b65bc512 am: 6b79fa99 am: 29204646" into oc-dr1-dev-plus-aosp
am: d36be4e4

Change-Id: Ia8da3f4e146141d9c15f89e020ebe7540125431c