Merge "Make Cloud Media Provider selection dependent on allow list" into sc-mainline-prod