Merge "Remove phoneId from ImsUceManager" am: 8478802be5 am: 9995982748

Change-Id: I4f11280d7130d9185615e2ba2116eb06de92fd27