Merge "[BUG] AudioService: PlaybackActivityMonitor: fix exploding list" am: 3e5cf8398a am: d2648ea1d7 am: f130b84f71

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

Change-Id: I0c0b99c563c2036b742f184c82929326dab792cf