Merge changes from topic "am-b13a1f4c-8656-492a-ba4c-6b204a543b93" into oc-dev

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