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

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



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