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

[automerger skipped] Merge "CellularDataService: mCallbackMap is not thread safe" into rvc-dev am: 5bb02f08 -s ours am: 31cf8a58 -s ours am: 725fda63 -s ours am: c7924012 -s ours

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

Change-Id: Ide0c9def95728dffec65cc9ad577fad13d2e3686