Merge "Add more consistent null checks" into main am: 2a3d34413c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3156278

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