Merge "Disable factory reset in DSU mode" into main am: 8136e6d397 am: 5fbc97e95b am: 869a83ef9d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2814174 Change-Id: I7fda5115ff3c092f509a82e59699f8fb79b45f6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: