Merge "Keystore 2.0 SPI: Switch to aidl union KeyParameters" am: 220d33ce2c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7cf1ccd129daf146f9672e70423d1a18355e3ed