Merge "Revert "audiopolicy: capengine: aidl hybrid mode enable"" into main am:...

Merge "Revert "audiopolicy: capengine: aidl hybrid mode enable"" into main am: 4a1e6e3a am: 708ef576

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



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