Merge "Simplify unregister logic for Connectivity Diagnostics callbacks."