Merge changes from topic "fix-b-284010885-align-aosp"

* changes:
  [AOSP_IMPR] AudioPolicy: engine: add matching score API
  fixup '[BUG] audio: misalignement of native/java AudioAttributes'