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

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



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