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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4e01b51cd86c965b5869bcf26fba95e9a74465a