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