[automerger skipped] Merge "CellularDataService: mCallbackMap is not thread...

[automerger skipped] Merge "CellularDataService: mCallbackMap is not thread safe" into rvc-dev am: 5bb02f08 am: 3d3f3654 am: 8a433f83 am: 4bedffd2 -s ours am: 135a6581 -s ours

am skip reason: Change-Id I7f5a507c2a79c7c77c5c2d7d3be147af80dc9f69 with SHA-1 ccc118ec is in history

Change-Id: I12a2831ebb55f89afca3d4f1540bda2a31576454