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

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

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