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

Change-Id: I82a67d2a77c6cfa2e903e3ff8080ba4ed734f248