am 5d636c8c: Merge "Fix AudioAttributes.usageToString() string return values" into cw-e-dev

* commit '5d636c8c50cc4a26492095b3df61801f3935424f':
  Fix AudioAttributes.usageToString() string return values