Merge "Add QS header margin to OHM touch adjustment" into tm-qpr-dev am: 38d1b72cb2 am: cc690abbae

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

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