[automerger skipped] Merge "RESTRICT AUTOMERGE Add 1/16th pixel offset when...

[automerger skipped] Merge "RESTRICT AUTOMERGE Add 1/16th pixel offset when drawing non-AA points/lines" into udc-dev am: 208ecf20 am: a9fbfab7 -s ours

am skip reason: subject contains skip directive

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



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