Fix different behaviors of deeplink in one/two pane am: a8c97980a6 am: 181853efb0

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

Change-Id: I8b990e14ceb2dce116d74dd670d36072d179555d