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

Change-Id: Ic1b21cd9a0fc906601bf37bf5e71aafdcbf0bd47