[automerger skipped] Merge "[DO NOT MERGE]Fix the inconsistent alignment of...

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

am skip reason: subject contains skip directive

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



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