Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e am: e8aaf2ba6f am: 4bd95131c6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: Ibb82102d632d497117411513adcdb5b298e51cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/core/SettingsBaseActivity.java

@@ -260,6 +260,9 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
     }
 
     private int getTransitionType(Intent intent) {
+        if (intent == null) {
+            return TransitionType.TRANSITION_NONE;
+        }
         return intent.getIntExtra(EXTRA_PAGE_TRANSITION_TYPE, TransitionType.TRANSITION_NONE);
     }
 }