[automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad19
-s ours am: 772238abd6
-s ours am: 941e1cadc4
-s ours am: b12551aad6
-s ours am: b75fa80578
-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: I8c7b7876da29c061106123bf1e78ac8c4a07eb9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: