Merge "Fix incorrect UI after triple-tap is disabled" into sc-v2-dev am: 2007a57560 am: 7f704f6c95

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

Change-Id: Ic1ed1eb6e8b74f80bbcc205be3cc45997f2b2ec2