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

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

Change-Id: I2d70aa675e3d7a7b7f09511480d7ad55a6433599