[automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 skipped: 842144c616 skipped: 9b8f9d3c00 skipped: c3762fa147

Change-Id: Iaa99e32862d0ee76854b47585ea859698ab1d70e