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

Change-Id: Id120c266f7b2b5b482fb7ebd52199250c347a9b1