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

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



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