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