Merge "Fixes "package doesn't belong to uid" exception for DeviceConfig clients calling DeviceConfig's access methods as root or shell."