Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 am: 7fa7052231  -s ours am: 91ec9a6fd3  -s ours am: a9c1e43d89
am: 82bc8c4511

Change-Id: I3765b00a451793307c9d23431f8b354bbe71b7df