Merge "Modify a data structure into a union." am: 8e965d90de am: 9d6b418d6f am: de12b9273e

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

Change-Id: I3cd75bcd78d3aa6855eb570f801c61cbca94eb10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>