[automerger skipped] Change Connectivity Manager to Network Manager am:...
[automerger skipped] Change Connectivity Manager to Network Manager am: 46601ac7 am: a28272b7 -s ours
am skip reason: Change-Id Ieeaac0e5080ce2fe7b6e223d50847dee74f08569 with SHA-1 cd66f963 is in history
Change-Id: I0ba4f6819eecff40556d3ece245d985f004bdf9a