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

Change-Id: I8c0309448a8abb1a8094b4a82a11db812bfd3ff6