[automerger skipped] Merge "Make Settings show in two-pane on portrait tablet"...

[automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf4 am: 966de44f -s ours am: f144ed6e -s ours

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

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



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