[automerger skipped] Merge "Audio: Rearrange types in V7" am: c563bfc08e am: 81f6751d1b am: ee85365aa9 -s ours

am skip reason: Change-Id I986b9bccdade5fa850b06b033143388715a656af with SHA-1 7dd87f42f1 is in history

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

Change-Id: Ia83a0736f1d421a283c3d22c6469daca3540a1e5