[automerger skipped] Merge "Fix the bug that user setting is removed when...

[automerger skipped] Merge "Fix the bug that user setting is removed when switching" into tm-qpr-dev am: d16866aa am: 9c2ec7a4 -s ours

am skip reason: Merged-In I79fecd6f0ef5d751ad4fbadb8cb3cc43df8f3bce with SHA-1 7459615e is already in history

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



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