Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am: e35213de2d
am: 21cc1102b4

Change-Id: Ifb645a0070300d95e4091969c25ff27d4615b56f