Merge "Audio: Rearrange types in V7" am: c563bfc08e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1506778

Change-Id: I4f141f2ef831b27a165dbb3f08684732485c6661