Merge "Revert "Check for null system device"" into main am: d2951755f4

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

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