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

Change-Id: Ic4ed1e52653137223737cd04c0e01168d14426ce