[automerger skipped] audiopolicy: Primary Output runtime management am: fa51ed78aa am: 54c69a83a8 am: 8694d6869a -s ours

am skip reason: Change-Id Iae8937cad3d70b0e8c7ff4516c27aa8eff231eaa with SHA-1 bce7cd48b7 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1460882

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I782b70eecd935f8c87691e802128ba47f5521616