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

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

Change-Id: I6722150496abc622dffbf5acb7b1afb334d605c1