[automerger skipped] Disable factory reset in DSU mode am: 0764d71e82 -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29068594
Change-Id: I3250660e299902e6fef14d7933269797fe33366a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: