[ Merge of http://go/wvgerrit/80084 ] Corrected the key type being returned after entitled keys from init data are loaded. Made test changes to validate. Bug: 133903028 Test: WV unit/integration tests Change-Id: Icb44587f5c3aba3b0facae6d83dc9344d6b60833