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: 419244bf

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



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