Merge "audiopolicy: engine: anticipate usage deprecation" am: 98fc7f6f am:...

Merge "audiopolicy: engine: anticipate usage deprecation" am: 98fc7f6f am: 09142113 am: 4f0ac606 am: 5cb1927a

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

Change-Id: If604f2995e83f02a76f9481d02488553af00e482