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

Change-Id: I227b081551539e4299f63c304a4e27d9be2070c7