Merge "Settings: Add notification channel for SIM selection" am: c543d5ba26 am: 7431ad3a80
am: 440373dbde

Change-Id: I605e13adb0e050ee73e646fa13c62f88271271b6