[automerger skipped] Merge "TouchInputMapper: Use default viewport for...

[automerger skipped] Merge "TouchInputMapper: Use default viewport for PointerController" am: 69f1479a am: 49990b46 -s ours am: e047760e -s ours am: e0b4fc8c -s ours am: d2e26cd5 -s ours

am skip reason: Change-Id Id73c59bce825855bc8c829c3a5a18c141593057e with SHA-1 a940fc6f is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1319647

Change-Id: Ie2409df9b3c5871a615b68dc916044be4bc3d327