Merge tag 'android-10.0.0_r23' into staging/lineage-17.1_merge-android-10.0.0_r23

Android 10.0.0 release 23

* tag 'android-10.0.0_r23':
  audio: free and assign NULL to global static device pointer

Change-Id: Ib07c17230f97f54746d3713c3137a04ca9428194
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 58d8f85..1c99066 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -6282,9 +6282,9 @@
 static int adev_close(hw_device_t *device)
 {
     size_t i;
-    struct audio_device *adev = (struct audio_device *)device;
+    struct audio_device *adev_temp = (struct audio_device *)device;
 
-    if (!adev)
+    if (!adev_temp)
         return 0;
 
     pthread_mutex_lock(&adev_init_lock);