Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
am: b613fec2f8

Change-Id: Ib3b670d0d0709640bd8498259a918357595c07f0