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

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



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