Merge "Prevent NPEs when registering/unregistering ConnDiags CBs." am: 5805d3cfd2

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

Change-Id: I0b39f045a4f0b51b278bf182ce36fbcf9c7fb8ca