Merge "AudioService: RecordActivityMonitor: fix unbounded list growth" am: 6e261d7b9a am: 9ccb8b939b am: a9a2a83b29

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

Change-Id: I666a0da728cff320aa24db560b3375b2ccf4848c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>