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: b83449af

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



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