Merge "Migrate ICaptivePortal to stable AIDL"
am: eb7c53718a

Change-Id: Id0844ec4d438dcc1f6c1028552dd21da6bd76584
tree: 8b0fa7b7c7b0fe7fd93bb77abcf5fe63d3855a59
  1. core/
  2. services/
  3. tests/