Merge "Change KeyParameters to use a union." am: d389d1659a am: 268ef54b1a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I663d342ea0bd7ec66ad59e1366654909c2247d34