Merge partner fix for ComprehensiveCountryDetector deadlock

The fix is in comment #1 in b/70679249

Bug: 70679249
Test: Code inspection. Existing tests pass.
Change-Id: I4a195239da2f5b82e273cb259bea1c9c79dc4d52
1 file changed