[automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556

Change-Id: I23172329a79f966e6544b4f91a5a4cc05962397a