Change class hierarchy of ImsServiceProxy and compat am: a7c3243f07
am: 8b6fa79cdb

Change-Id: I952b03163f3093f778e954dfb05cc24b05174671