[automerger skipped] Merge "TouchInputMapper: Use default viewport for PointerController" am: 69f1479a am: 49990b46 -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: I689679bf7cc62853989334097227ce628af9e50b