[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: d498d8b580
am: 00143bf156
am: ccb34dc532
-s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 784e52c9be
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306
Change-Id: Ic81b627c3a8b46c69343bc9181fef00d314ada84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: