[automerger skipped] Merge "Disable factory reset in DSU mode" into udc-dev...

[automerger skipped] Merge "Disable factory reset in DSU mode" into udc-dev am: 3f7f1a7c -s ours am: 29c7e21b -s ours

am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a0789 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110303



Change-Id: I8385fdcee5afc3992039b8be0f1954214670177a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>