Merge "Update oob data struct" am: f2c4a568cc

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

Change-Id: I3c401d8fed1fcaf012fcf6947e266e0650934614