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

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

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