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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4334727b4f6132fd684eb1f1d840bde311421358