[automerger skipped] Merge "RESTRICT AUTOMERGE pixel-snap on HWUI side" into...

[automerger skipped] Merge "RESTRICT AUTOMERGE pixel-snap on HWUI side" into tm-qpr-dev am: a8971c24 am: 47850361 -s ours am: 668dfe98 -s ours

am skip reason: subject contains skip directive

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



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