[automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba

Change-Id: Ic5e9666f88a669e5b13e098609abe20bbd476f21