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

[automerger skipped] Merge "CellularDataService: mCallbackMap is not thread safe" into rvc-dev am: 5bb02f08 am: 3d3f3654 -s ours am: a0eb73e7 -s ours am: 90a88ade -s ours

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

Change-Id: I87606c7b20e5b670a7673bd4d907d1c0b310aeed