[automerger skipped] Merge "Don't reregister AoD UDFPS gesture after trigger" into tm-d1-dev am: 235978f9c4 am: a45b7b41bd -s ours
am skip reason: Merged-In I7bdd1838385d755a17eefd79e24bf4eb9f72a44c with SHA-1 4ddf61134d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18874092
Change-Id: I0b31186f64ed14c4c2258fdddacc85543acafa99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: