Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: 5e5ea25a2b am: 6ef0f6fed7 am: 908868a215

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076

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