Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev

src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java

@@ -38,7 +38,8 @@ public class InstantAppDomainsPreferenceController extends AppInfoPreferenceCont
 
     @Override
     public int getAvailabilityStatus() {
-        return AppUtils.isInstant(mParent.getPackageInfo().applicationInfo)
+        return mParent.getPackageInfo() != null
+                && AppUtils.isInstant(mParent.getPackageInfo().applicationInfo)
                 ? AVAILABLE : DISABLED_FOR_USER;
     }