[automerger skipped] Merge "Implement drag then snap flicker test" into...

[automerger skipped] Merge "Implement drag then snap flicker test" into udc-dev am: 88957856 am: 279234da -s ours

am skip reason: skipped by user gabiyev

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



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