Merge "Use SwitchPreferenceCompat for UI consistency" into main am: 77f21a8d0a

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

Change-Id: I932bcbfd0f9b444ec87de09bfbf1eb57ebdfe803
Signed-off-by: Automerger Merge Worker <[email protected]>