[automerger skipped] Merge "Triggering notifications when dual CDMA SIM combinations are detected" am: be0d8fc39b am: 939aef288a -s ours am: bc381e5fc1 -s ours
am: 0a501ab6e5 -s ours
am skip reason: change_id I5caf39478dd0814aa1b2def801b1c3a107355682 with SHA1 034cb343a1 is in history

Change-Id: Ic2192e895187342f79fc524aa62f45c50e144708