Merge "Use safe_union correctly" am: baf61434fd am: 8e4e5639c9 am: 51e593d4f2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cb16ae1becb3af2eb16861b4d3d946cec56c227