Merge "support msim for captiveportal notification"
am: edbf24ad3b

Change-Id: I3bed0b6d44a13a4dd1c68b21a28b75e4e6c7aa81