[automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's...

[automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c4588165 skipped: fd3a46a9 skipped: 099f0d75 skipped: 842144c6 skipped: 9b8f9d3c skipped: c3762fa1 skipped: 991a84f3 skipped: 15c0925f ski skipped: 7e571e4c am: a28856d4  -s ours
am: 6579d3cd  -s ours

Change-Id: Ia282bea11ee606aeeffa474dab28d0851bce9ccc