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

Change-Id: I65ebd913f108022061511a625c9da38b4cf4cd58