[automerger skipped] [DataStore] Provide SharedPreferencesStorage am: 096554fa -s ours

am skip reason: Merged-In I3f6bbf82855aab2b376d96b38747f295cf96085e with SHA-1 e753701d is already in history

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



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