Merge "Prevent modifying mAudioPolicies during iteration" into tm-qpr-dev am: 7926ae7f

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



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