Merge "Adding AudioUsage converters to AudioAttributes" am: 87b5c6a2a1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518202

Change-Id: I6e84fcacbc45e667f592ef247ea1e87d9ae8e248