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

Change-Id: I884c1c8ef1be258a86f05df2e3f673c56109c470