Merge "Migrate compat mode allowed list to DeviceConfig"