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

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

Change-Id: If52a8b0cc9d2ea43b0f49a0d03b501f60f44a4c5