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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I971a63dc8a73982a5bb394c9c148037cb3fe12b8