Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e am:...

Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e am: d498d8b5 am: 00143bf1 am: 22d4e174

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



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