Merge "CellularDataService: mCallbackMap is not thread safe" am: 88d585becf am: 62b60cf729

Change-Id: Id55fdd803d2cfc10f15b11d9367d911b27457114