Merge "Cleanup TestableNetworkCallback#assertNoCallback"