[automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a2 -s ours

am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f is already in history

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



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