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

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



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