Merge "Include phoneId as extra when subId is not available." am: 7299401e81
am: 03bc1f9b3a

Change-Id: I967df310fe65a355a6ed79b8464b34981614efbf