Merge "Use single line header in landscape handheld" into tm-dev am: a6713ec9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607579



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