[automerger skipped] [DataStore] Support backup data state computation am: 85e130ad7a
-s ours
am skip reason: Merged-In I8ad4f2788f9f364eceb1bca841830e1f3a68fe77 with SHA-1 5847d50e7b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26561030
Change-Id: If9090bd12fcf9d92ddf43bbd5f0e6b171ccdeacb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: