Merge "CellularDataService: mCallbackMap is not thread safe"