Merge "Do not use MediaCommunicationManager below Android S" into sc-dev