Merge "Move ImsServiceProxy to opt/net/ims"