Merge changes from topic "system_mr2_media_content_control" into sc-dev

* changes:
  System MediaRouter2: Resolve API review
  Change MODIFY_AUDIO_ROUTING permission to MEDIA_CONTENT_CONTROL