Merge "CellularDataService: mCallbackMap is not thread safe" am: 88d585be am: 62b60cf7 am: 7f42fd84 Change-Id: I1cd3e127bda8ec921d146436ebc6d2227aced443