4.3 services/connectivitymanager

Change-Id: I4777eddee04a6df37098c3e17c0eca210399038e
Merge remote-tracking branch 'pa/jb43' into jellybean-legacy