Merge "Adding AidlMQDescriptor and GrantorDescriptor" am: f0fc3e4b8f am: b087fa8051

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

Change-Id: I81c49e50a7a09c1287711fb87b0fd2677f75cf63