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