Merge "Add unregisterClient in instance close." into sc-dev am: f03fa75cc8 am: e9bfc9c4a6

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

Change-Id: I7ffbc52aa920cedf97a29739c8154b1c960b268b

media/java/android/media/tv/tuner/Tuner.java

@@ -347,7 +347,6 @@ public class Tuner implements AutoCloseable  {
             mHandler = createEventHandler();
         }
 
-        mHandler = createEventHandler();
         int[] clientId = new int[1];
         ResourceClientProfile profile = new ResourceClientProfile();
         profile.tvInputSessionId = tvInputSessionId;
@@ -516,6 +515,8 @@ public class Tuner implements AutoCloseable  {
             mDemuxHandle = null;
         }
 
+        mTunerResourceManager.unregisterClientProfile(mClientId);
+
     }
 
     /**