Merge "Fix b/276423111: Keep unchanged perferences in the app list instead of...

Merge "Fix b/276423111: Keep unchanged perferences in the app list instead of clear all." into udc-dev am: 56c16c24

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



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