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

Change-Id: I93b1ba1d5c48d90987c61289dfa6d0bf5bc7a367