Merge "[DO NOT MERGE]Fix the inconsistent alignment of the main switch...

Merge "[DO NOT MERGE]Fix the inconsistent alignment of the main switch preference." into tm-qpr-dev am: bbb51619

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



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