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

Change-Id: I3b8a1840d3d5c09fa50e9e220fef37200782be01