Merge "Keystore 2.0 Legacy wrapper: Add missing tag conversions." am: 494abbbfd8

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1665680

Change-Id: I70c95c12d78b30a8cf5cbacc0377d86f137d1fa7