Merge "[Controls] Update shared pref to be user specific." into tm-qpr-dev am: 67eab634f4

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

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