Merge "Fix C compatibility in AMidi.h." into tm-dev-plus-aosp am: d34388f8 am: 40e392c2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19441167



Change-Id: I0b3a1891883ae16e41d04dd09427172116a53971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>