Merge "support msim for captiveportal notification"
am: 5c83418408

Change-Id: I3bed0b6d44a13a4dd1c68b21a28b75e4e6c7aa81
tree: b54973a79df147453459f353c8f9bc06dac73251
  1. core/
  2. services/
  3. tests/