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

Change-Id: I259235ef7337d6ad8ed40a8b58e693bd9c0ee5bb