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

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

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