Merge "Fix the bug that user setting is removed when switching" into tm-qpr-dev am: d16866aa

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



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