Merge "Switch class hierarchy of ImsServiceProxy and compat"
am: 7805de4002

Change-Id: I0ec39abb8006c7b29b449a59c7408a97549671f0