Merge changes from topic "presubmit-am-9222e5f68a4c4986840a218e2ed2f9c5"

* changes:
  [automerge] Annotate MediaCommunicationService for only >= S 2p: 698b425133
  Annotate MediaCommunicationService for only >= S