[automerger skipped] Merge "Adding AudioUsage converters to AudioAttributes"...

[automerger skipped] Merge "Adding AudioUsage converters to AudioAttributes" am: 87b5c6a2 am: 659f09f5 am: c67fa6b7 -s ours

am skip reason: Change-Id I5301276ebd6ea1539182e9925a1e19f515e80597 with SHA-1 24b336f8 is in history

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

Change-Id: Id12f5c0327e80b959e033648cf9f47b2d20cfe0c