[automerger skipped] Merge "CellularDataService: mCallbackMap is not thread safe" into rvc-dev am: 6ff894b7 -s ours am: d3657ba8 -s ours am: 9637ec2d -s ours am: 61c2eb9a -s ours

am skip reason: Change-Id Id0f830b27b0b64e83a937b76575bd9497e56cd03 with SHA-1 276b481c is in history

Change-Id: Idd2a1dd6cded779e2b6943127d1062c4e49af9cc