Merge "Add error handling for onConfigurationChanged" into sc-v2-dev am: bca4bd6bab am: f6ed082d5a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16682144

Change-Id: Iac1ce0cf84cec7e7c90b04fff20e97bd54171773

core/java/android/app/Activity.java

@@ -1524,7 +1524,10 @@ public class Activity extends ContextThemeWrapper
     }
 
     private void dispatchActivityConfigurationChanged() {
-        getApplication().dispatchActivityConfigurationChanged(this);
+        // In case the new config comes before mApplication is assigned.
+        if (getApplication() != null) {
+            getApplication().dispatchActivityConfigurationChanged(this);
+        }
         Object[] callbacks = collectActivityLifecycleCallbacks();
         if (callbacks != null) {
             for (int i = 0; i < callbacks.length; i++) {