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

Change-Id: I104f430d0bf1897e59bffdfe2bc3e13a9b058a1c