Merge "CellularDataService: mCallbackMap is not thread safe" into rvc-dev