[automerger skipped] Merge "Prevent modifying mAudioPolicies during iteration"...

[automerger skipped] Merge "Prevent modifying mAudioPolicies during iteration" am: aded5264 am: 439bed36 am: 1b202c9a am: 284c99db -s ours

am skip reason: Merged-In I83fa969204d8a9c6ac7bae40f5be57a92813f6be with SHA-1 65b89804 is already in history

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



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