Merge "Move GrantorDescriptor definition out of MQDescriptor" am: cf7bb8f437

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1403103

Change-Id: I0cd894733fb504356e9ecf0ec40e77cdad5b9e27