[automerger skipped] Merge "BluetoothMidi test: test encoder and decoder" into...
[automerger skipped] Merge "BluetoothMidi test: test encoder and decoder" into rvc-dev am: 7bfa49bf am: 70498a16 am: 61dd458b -s ours
am skip reason: Change-Id I767deab6847d2b45e01bed29f5eed3df0f0e46c0 with SHA-1 6c0aff04 is in history
Change-Id: I1b57d46031cde67ca5809c58ce68421ec8ea3a29