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

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

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



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