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

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



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