[automerger skipped] Merge "Update oob data struct" am: f2c4a568cc am: a0662b0c10 am: 157000483e -s ours

am skip reason: skip tag Change-Id Ia06b8c65cac45694a3a9f01ca73bf6e0b3010d06 with SHA-1 63e4dc0237 is already in history

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

Change-Id: I778d15970443651b3b33287710cf545d687ea305