Merge "Allow the System UID to unregister ConnDiags CBs."