[automerger skipped] Merge "Disable factory reset in DSU mode" into udc-dev am: 3f7f1a7c45
-s ours am: 7d49b3bc98
-s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110303
Change-Id: I5e119a17e4f917eff4dfeddcbb774a3dbf17674d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: