[automerger skipped] Merge "Prevent modifying mAudioPolicies during iteration" am: aded52644c am: 439bed3619 am: 1b202c9aab am: 284c99dbef -s ours
am skip reason: Merged-In I83fa969204d8a9c6ac7bae40f5be57a92813f6be with SHA-1 65b8980444 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>
This commit is contained in: