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

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

Change-Id: Ie9a103094e96860eaef4fb1f4ae1f60af686b057