Merge "Don't start two pane for singleInstance deep links" into tm-dev am:...

Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d1 am: aaa3ad08 am: 9d4b8fab am: 0ca50986

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



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