Merge "[AudioPolicy][engineconfigurable] audioattribute should match audio_stream_assist first" am: 84b712329f am: 649738b538 am: 74e2e7c68d

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

Change-Id: Iffdb543c67b1b7e409e7716d4ba5c6b9f8538e32