Merge "Fix NullPointerException happens in dumpCheckin" am: 6b7e457988

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

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