Merge "Revert "Check for null system device"" into main am: d2951755f4 am: 5407880d58 am: 091edc859d

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

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