[automerger skipped] Merge "CellularDataService: mCallbackMap is not thread...
[automerger skipped] Merge "CellularDataService: mCallbackMap is not thread safe" into rvc-dev am: 6ff894b7 -s ours am: d3657ba8 -s ours
am skip reason: Change-Id Id0f830b27b0b64e83a937b76575bd9497e56cd03 with SHA-1 276b481c is in history
Change-Id: Ie78b72911ec2d1e67d0cf6a08b6a920f9086e605