Merge "Merge "Fixe the problem of invalid switch preference." into tm-dev am:...

Merge "Merge "Fixe the problem of invalid switch preference." into tm-dev am: 3797d090 am: 4532f7f9 am: 419244bf" into tm-qpr-dev-plus-aosp am: a9ed29f9

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



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