Merge "Merge "Revert "Revert "Fix mPositionInWindow to not use global...

Merge "Merge "Revert "Revert "Fix mPositionInWindow to not use global coords""" into sc-dev am: 2fe11f12 am: f5ff9a04" into sc-v2-dev-plus-aosp am: 929490f9

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

Change-Id: I39d212ed20e395e0a64408e9c4c653c1fcd7b0a5