Snap for 7637344 from 16bcdc7eb1ee559b70c106ca0fd706e65179306c to sc-d1-release

Change-Id: I35f940f18732421e8db390d1b3832df17673a86d
diff --git a/src/com/google/android/iwlan/ErrorPolicyManager.java b/src/com/google/android/iwlan/ErrorPolicyManager.java
index 107476d..15d8116 100644
--- a/src/com/google/android/iwlan/ErrorPolicyManager.java
+++ b/src/com/google/android/iwlan/ErrorPolicyManager.java
@@ -151,7 +151,7 @@
     private Map<String, List<ErrorPolicy>> mCarrierConfigPolicies = new HashMap<>();
 
     // String APN as key to identify the ErrorInfo associated with that APN
-    private Map<String, ErrorInfo> mLastErrorForApn = new HashMap<>();
+    private Map<String, ErrorInfo> mLastErrorForApn = new ConcurrentHashMap<>();
 
     // List of current Unthrottling events registered with IwlanEventListener
     private Set<Integer> mUnthrottlingEvents;