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

Change-Id: I30b2d65e2a58d70b2718ece3560f20592dff8440