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

Change-Id: Ib96d94436ff828f1d476370edb4eccb9ccec041d