[automerger skipped] Audio HAL V7.1: Interfaces & types am: 51a7e138 am:...

[automerger skipped] Audio HAL V7.1: Interfaces & types am: 51a7e138 am: 54e9a3a8 am: eb413a0f am: 8245db0d -s ours

am skip reason: Merged-In I3caa2fda2fb5d7d8e8292e23fb2cf0e32e05c146 with SHA-1 a0cd9449 is already in history

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

Change-Id: I8a2d6f264e4fd2cf7cd3f4b2d08d52eaaf641c72