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

Change-Id: I4720e56a5462a67111e2e40bc6ece7872b63d633