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

Change-Id: I26ed9920543db1d26ca451d288533940f42f33a7