DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9 am: 48b3aca54b  -s ours am: 08eab78209  -s ours
am: 081388d875

Change-Id: I685261698d0ecb4e77b5e78aab83b2b38b6a91fb