Change class hierarchy of ImsServiceProxy and compat

Modifies ImsManager to use new ImsServiceProxy
class hierarchy.

Test: Manual
Change-Id: I0be48ff1b17c53933aabf0561957dee08f3205b0
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index a782baf..7ed0ab5 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -183,7 +183,7 @@
     private CarrierConfigManager mConfigManager;
     private int mPhoneId;
     private final boolean mConfigDynamicBind;
-    private ImsServiceProxyCompat mImsServiceProxy = null;
+    private ImsServiceProxy mImsServiceProxy = null;
     private ImsServiceDeathRecipient mDeathRecipient = new ImsServiceDeathRecipient();
     // Ut interface for the supplementary service configuration
     private ImsUt mUt = null;