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

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

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



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