[automerger skipped] Merge "audio: Align lists of enum values between framework and HAL" am: bc4f8456 am: 08d21abc am: 4ee8c487 -s ours

am skip reason: Change-Id I2df5eb4bc4a393611d3adb0ee30583767197591b with SHA-1 bbbec822 is in history

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

Change-Id: Id9f78adf664529adca378a5a280a7e53f5afc89b