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 am: 38a06ba0

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



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