Merge "Fix 2520977: NPE in com.android.settings.deviceinfo.Status"