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

[automerger skipped] Merge "Disable factory reset in DSU mode" into tm-qpr-dev am: 702da9e7 -s ours am: 04a6b4eb -s ours

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

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



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