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

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



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