[automerger skipped] Merge "Disallow factory reset while in DSU mode" into...

[automerger skipped] Merge "Disallow factory reset while in DSU mode" into udc-qpr-dev am: d8c41c66 -s ours

am skip reason: Merged-In I36afa074f16bb7ebf8b617de73dab3d4df5fb5dc with SHA-1 72f795b3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/35298880



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