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

Change-Id: I2a28b1b096239091af8c063418994e7db0d35df4