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

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

Change-Id: I2f0820dcdb2d9bf6569abe3ea4abb10af6b5b0fa