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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5fa7cd454b98ba8b3518c151f8504cb6c76218b