Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d39656

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216



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