[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 am: a45b7b41 -s ours am: 6c9f8816 -s ours

am skip reason: Merged-In I7bdd1838385d755a17eefd79e24bf4eb9f72a44c with SHA-1 4ddf6113 is already in history

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



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