[automerger skipped] Merge "Block access to locked DSU for SHELL" into udc-qpr-dev am: 3bf54afbc9 -s ours

am skip reason: Merged-In I73c9147b6da7c0385dc3a3c5ed5272f6cad79b92 with SHA-1 30923fb8fe is already in history

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

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