Merge "Revert "Check for null system device"" into main am: d2951755f4 am: 979f6fcebe am: 638ec0cc01

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

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