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

Change-Id: I2a28b1b096239091af8c063418994e7db0d35df4