[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 skip reason: Change-Id Id0f830b27b0b64e83a937b76575bd9497e56cd03 with SHA-1 ccd79ce9 is in history
Change-Id: Ie037bbd379d63e70f7610e5e08e1f444f05ac0ed