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

Change-Id: I800de9709886e95cf08679acaa630f84741dbd7e