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

Change-Id: I02e6fd7b7470068b74119df5ca17e5d4dd4f78a1