Merge "Remove phoneId from ImsUceManager"
am: 8478802be5

Change-Id: Ia63840cb8c2c1d9792d929dc9248a4b21ff30c58