Merge "Use PHONE_KEY instead of SLOT_KEY as telephony always passes phoneId isntead of slotId" into qt-dev am: 152cc76bc0 am: a6cc201fc5
am: b7a96123d5

Change-Id: I99ae250d2b240d6acfcf5db96eede2c0a763405e