[automerger skipped] Merge "Move engine loading out from the...

[automerger skipped] Merge "Move engine loading out from the AudioPolicyManager" into udc-dev am: c58e7554 -s ours am: db241ab3 -s ours

am skip reason: Merged-In I5185d8e27fccf64ba14856d3a1f0ea07a47f02e0 with SHA-1 abb04782 is already in history

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



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