[automerger skipped] Merge "Don't reregister AoD UDFPS gesture after trigger"...

[automerger skipped] Merge "Don't reregister AoD UDFPS gesture after trigger" into tm-d1-dev am: 235978f9 -s ours am: 4a625002 -s ours am: 98f06cff -s ours

am skip reason: Merged-In I7bdd1838385d755a17eefd79e24bf4eb9f72a44c with SHA-1 5f8ab566 is already in history

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



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