Merge "Check for null system device" into main am: 30c1fa1593 am: e8cdd6eae4 am: 4da78962c3

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

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