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: 21aa6d56 am: 65921519

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



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