Merge "Add cloud provider APIs to MediaStore" into sc-mainline-prod