Merge "Update oob data struct" am: f2c4a568cc am: a0662b0c10

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1636699

Change-Id: I589fdd3ed84c0221059a8c87cae1eae217aeb594