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

Change-Id: I4e5872b649f75d9d3483f48d5955fb80b6ae336e