Merge "Merge "Update tests to account for different pixel snapping behaviors." into android12L-tests-dev am: bb2ee4b207" am: 231a291911 am: a14cb5b082

Original change: https://android-review.googlesource.com/c/platform/cts/+/2051892

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