[automerger skipped] Merge "Merge "Update tests to account for different pixel snapping behaviors." into android12L-tests-dev am: bb2ee4b207" am: 231a291911 am: a14cb5b082 am: 3479a479da -s ours

am skip reason: Merged-In Ic04ed905053aebf97fe9e05f8e32646b747e934c with SHA-1 fbc449cf67 is already in history

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

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