Merge "Respect disable flag in LargeScreenHeader" into tm-dev am: b15f71e2 am: 12a36b12

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



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