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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19600272

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