Keystore 2.0: Add missing context in generated and import key.

Also small cleanup in enforcements.rs.

Test: N/A
Change-Id: If6afcb5e247402c1201a1a8719e35e369a38d99e
2 files changed