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

[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e am: 75a0b01e am: db47f7bf -s ours am: f39aa3ea -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/+/29110306



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