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

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

Change-Id: Icce7853960e621266a8817f22cf88a52fae7a7d5