Merge "[DO NOT MERGE][CDM] Fix setSkipPrompt on Android S" into sc-dev