[automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 skipped: 842144c616 skipped: 9b8f9d3c00 skipped: c3762fa147 skipped: 991a84f3d8 skipped: 15c0925fbd ski skipped: 7e571e4cb9
am: a28856d4cf  -s ours

Change-Id: I8493db16f79ab0f751a8230e7c7cc59ed6800485