Merge "Fix touches in Large screen header" into tm-qpr-dev am: ea7e2c10 am: 8a61c0c2

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



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