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 am: 26c3c3a9

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



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