Merge "Fix the inconsistent alignment of the main switch preference." into...

Merge "Fix the inconsistent alignment of the main switch preference." into tm-qpr-dev am: aea8f1ae

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



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