[automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: c7fe16530e am: 769fd6af7e am: 3920861bf9

Change-Id: I4335e0947ff98756de0c0cfb5431120e12445523