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

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

Change-Id: I91228442735527e275a326ee6b5bccff0cffe993