Merge "Move some methods to DeviceInfoUtils in SettingsLib"