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

Change-Id: If8fbd0b2adf9f3f2f9a5d4a670b1e0bf1b445066