Merge "Switch class hierarchy of ImsServiceProxy and compat"