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

am: fcec01f040

Change-Id: Ia27032259a31a585ac93ac90b8251af7d7e2f76d

diff --cc config/compiled-classes-phone
index 7703fdc,47d3883..c91c932
--- 1/config/compiled-classes-phone
--- 2/config/compiled-classes-phone
+++ b/config/compiled-classes-phone
@@@ -3942,9 -4001,8 +3942,7 @@@ android.telephony.TelephonyManager$Mult
  android.telephony.VisualVoicemailSmsFilterSettings
  android.telephony.VoLteServiceState
  android.telephony.VoLteServiceState$1
 -android.telephony.euicc.EuiccManager
  android.telephony.gsm.GsmCellLocation
- android.telephony.ims.ImsServiceProxy$INotifyStatusChanged
- android.telephony.ims.ImsServiceProxyCompat
  android.telephony.ims.feature.IMMTelFeature
  android.telephony.ims.stub.ImsConfigImplBase
  android.telephony.ims.stub.ImsEcbmImplBase