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

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

Change-Id: Icd9568ea77447fe470fb3433d4828db4529afe43