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: I3c18b006839d2026ce5dc70c7299a3fb1459bd4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>