[automerger skipped] Simplify unregister logic for Connectivity Diagnostics callbacks. am: 982013743b am: f3cc967bc6 -s ours
am skip reason: Change-Id I9096969a1bf33da72b117f5bbc88257df805e688 with SHA-1 f047313940 is in history
Change-Id: I92333ea01c7b82c132ba3c3d83a7ce4f43b3a09e
This commit is contained in: