Merge "Move ImsServiceProxy to opt/net/ims" am: b5d2f0c24f am: 6093305789
am: fcec01f040

Change-Id: Ia27032259a31a585ac93ac90b8251af7d7e2f76d