Merge "Adding AidlMQDescriptor and GrantorDescriptor" am: f0fc3e4b8f

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

Change-Id: I79fab9357ed17e2108e12714400238d1dd9c57be