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

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

Change-Id: I014c3c708a8fd6a88445a87492efd6111e75d1e3

core/java/android/companion/CompanionDeviceManager.java

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