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

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

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