Merge "Muting notifications due to focus is conditional on recording" into main

core/api/test-current.txt

media/java/android/media/AudioManager.java

media/java/android/media/IAudioService.aidl

...ices/core/java/com/android/server/audio/AudioService.java

...core/java/com/android/server/audio/MediaFocusControl.java

...roid/server/notification/NotificationAttentionHelper.java

...droid/server/notification/NotificationManagerService.java

...a/com/android/server/notification/NotificationRecord.java

...rc/com/android/server/notification/BuzzBeepBlinkTest.java

.../server/notification/NotificationAttentionHelperTest.java