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

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

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