Merge "Remove unnecessary null check" am: daced9e4b8

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

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