Merge "Block access to locked DSU for SHELL" into main am: a83e18a56d

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

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