[automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19 -s ours am: 772238abd6 -s ours am: 3ee1da0bb3 -s ours am: 6a4398d516 -s ours am: c6a9dcc88e -s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066436
Change-Id: I8fb2dbcffe97aaa9c24b921603f0bd58af14c136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: