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

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

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



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