Merge "[automerger skipped] Add a null check to prevent NullPointerException...

Merge "[automerger skipped] Add a null check to prevent NullPointerException am: 10039a47 am: e3e707a3 am: e2fd218f -s ours" into rvc-qpr-dev-plus-aosp am: 34d522e2 -s ours

am skip reason: Change-Id I5d5e98add0ea2abf92156c11188739c535e7e9a8 with SHA-1 c4b59dd6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11702815

Change-Id: I61bfcdc9d4e1492c414398333bf6a925886ae3ef