Merge "Fix API in CaptivePortal and ConnectivityManager"
am: 8f4c739827

Change-Id: I4cc3c61232c74bafe4eb549c1aba5de20a8bb3ff
tree: 53b3f5cb35c996b0cf27da9e4c96e9ab32c16fee
  1. core/
  2. services/
  3. tests/