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

Change-Id: Icde853dde9257a0314b0ebe1619edb7eb55d216d