[automerger skipped] Merge "Prevent modifying mAudioPolicies during iteration" into tm-qpr-dev am: 7926ae7f37 am: e00eb8aac4 -s ours
am skip reason: Merged-In I83fa969204d8a9c6ac7bae40f5be57a92813f6be with SHA-1 6f837517a2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19487769
Change-Id: I02f408655a7429f95e347a11417f2a6fa416533a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: