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