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

Change-Id: I4c2b70f9faf61a9cd6863a8ab71222dd15738d1a