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

Change-Id: I107e618338f1f8125f03a2be40d826ddfff7502d