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

[automerger skipped] Merge "Move engine loading out from the AudioPolicyManager" into udc-dev am: c58e7554 am: 6f936d6e -s ours am: d5315575 -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: I81517d21d13d13db7b1f0c2452e5eeccda4b8a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>