Merge "Use safe_union correctly" am: baf61434fd

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1510995

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89dac63df8547d9609a547cc8081de374505f4eb