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: ac572e72 am: 197b3072 am: 9d14efff

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



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