Merge "RESTRICT AUTOMERGE pixel-snap on HWUI side" into tm-qpr-dev am: a8971c24

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



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