Merge "Retrive the value of user-pref, if its not stored in...

Merge "Retrive the value of user-pref, if its not stored in persistentDataStore" into tm-qpr-dev am: 7239296d

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



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