Merge "Merge "Fix BT keeping wrong state issue" am: 7cd490c941 am: 4f73919dd7" into qt-dev-plus-aosp

services/core/java/com/android/server/media/MediaSessionRecord.java

@@ -729,6 +729,9 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
         PlaybackState state;
         long duration;
         synchronized (mLock) {
+            if (mDestroyed) {
+                return null;
+            }
             state = mPlaybackState;
             duration = mDuration;
         }