Merge changes from topic "presubmit-am-b4bd5ce7b4f34be08b452106d0393ce8" into sc-v2-dev-plus-aosp am: a0b428bbb7

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

Change-Id: I666d36fedf230f91bf42405e7478e27c28fa1b3c

services/core/java/com/android/server/audio/SpatializerHelper.java

@@ -275,6 +275,7 @@ public class SpatializerHelper {
      */
     synchronized void reset(boolean featureEnabled) {
         Log.i(TAG, "Resetting");
+        releaseSpat();
         mState = STATE_UNINITIALIZED;
         mSpatLevel = Spatializer.SPATIALIZER_IMMERSIVE_LEVEL_NONE;
         mCapableSpatLevel = Spatializer.SPATIALIZER_IMMERSIVE_LEVEL_NONE;
@@ -831,10 +832,10 @@ public class SpatializerHelper {
             try {
                 mSpat.registerHeadTrackingCallback(null);
                 mSpat.release();
-                mSpat = null;
             } catch (RemoteException e) {
                 Log.e(TAG, "Can't set release spatializer cleanly", e);
             }
+            mSpat = null;
         }
     }