Merge "Add service CellularNetworkService in manifest." am: eae45f4068 am: 8e8f6c1eb2
am: 300fbd0b06  -s ours

Change-Id: Ia2b9c2afc550ec2d68adcf3e291a550ad7ace344