[automerger skipped] Merge "Disable factory reset in DSU mode" into sc-qpr1-dev am: 93b2db6351
-s ours am: 8009906cb6
-s ours am: bd29320e54
-s ours am: cf2d79ba25
-s ours am: 3e0290986f
-s ours am: 87b37d0b28
-s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 4296cc1977
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30075447
Change-Id: I246276bcbdb3531fbbbea20431ea7244b6a5902c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: