Merge "Fix Calls/SMS default SIM selector" into qt-dev
am: 7af299c604

Change-Id: I35b3e57d151b6d20e5b088a7d6269490317644e5