Merge "Fix coordinate error after rotation and scaling in TouchInputMapper" am: 7de7b8c5d9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f491fa494306381f8fd9051b409dad76a68b2fe