Merge "Fix ImsManager callback called once registered" am: 4fb756984d am: b245fc9f1d
am: 4d1df38683

Change-Id: I7dd888864b82e4f4f79a561d777185a16bf0b610