Merge "Check null NetworkSpecifier before redacting" am: 435c4f7fc5 am: 9c5e87388d

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

Change-Id: I7e317ebb77d921c50e21a6a710e388e453cdfe62