Check for null system device am: 471169858c am: 69cab3dc20

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

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