[automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 am: 2b9a42237e

Change-Id: Ifa61d507d9f502e664703ee371a936b5aa1e9ecf