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

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

Change-Id: Ie9074caca5c79262050092b74cda97b753376105