Merge "Start deep link page synchronously in SettingsActivity" into sc-v2-dev am: b4d3278a45 am: e7a681748e

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

Change-Id: I937db64f2c4ab9dfb82637bc7c775c05c4383fb6

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

@@ -74,6 +74,9 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (isFinishing()) {
+            return;
+        }
         if (isLockTaskModePinned() && !isSettingsRunOnTop()) {
             Log.w(TAG, "Devices lock task mode pinned.");
             finish();