Merge "Fix CDM memory leak for activity context" into sc-v2-dev am: 6ebf85244c am: 8e2c2f1b3f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16201030

Change-Id: Ia9d2edd4be1cdac0247649a95261ba2f063df7e8

core/java/android/companion/CompanionDeviceManager.java

@@ -109,7 +109,7 @@ public final class CompanionDeviceManager {
     }
 
     private final ICompanionDeviceManager mService;
-    private final Context mContext;
+    private Context mContext;
 
     /** @hide */
     public CompanionDeviceManager(
@@ -572,6 +572,7 @@ public final class CompanionDeviceManager {
                 mCallback = null;
                 mHandler = null;
                 mRequest = null;
+                mContext = null;
             }
         }