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

Change-Id: I3c1a2caeb2eb2ceed89a2d65e8eb5365c0daa921