Merge "audiopolicy: engine: anticipate usage deprecation" am: 98fc7f6f3e

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

Change-Id: I899b91df2c057f70dee20e377480e8d30e53a052