Merge "Whitelist DeviceConfig permissions for MediaProvider"