Merge "RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free" into nyc-dev