Merge "support msim for captiveportal notification" am: edbf24ad3b am: 542f905e4c
am: b742a85280

Change-Id: Ia6babd4bae6fcffdc3149f76c7e378b14ec42375