Merge "Remove coordinate swapping in region sampling" into tm-qpr-dev am: 9f4673fc94 am: f91b998101

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

Change-Id: I4aada8e593b69623fd49cba9c6fa19e0bd897dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>