Keystore 2.0: Make compatiblity wrapper use union KeyParameters.

Test: N/A
Change-Id: I411d90a71c5722281f13c28d55961d571f2eec90
7 files changed