Keystore 2.0: Temporary fix for associating keys with their KM instance.

This will be superseded soon. But it fixes weird notions of some
software KM implementations about their security level.

Test: N/A
Change-Id: I8554bcaf46b555d77e3b05a983e8b581f3a2157c
1 file changed