Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf4

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



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