Merge "Prevent the shell from exiting DSU mode when it is locked" into main am: 5b96117cd9 am: 5aa5995da3 am: be5b451e41 am: 9f1ffad438

Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/2727835

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