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 am: fa6e4702 am: 7c75ca29

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



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