Keystore 2.0: Fix legacy wrapper key upgrade.

The legacy wrapper did not handle the key blob prefixes correctly which
were added to discriminate between wrapped and native keyblobs.

Test: Manually tested by bumping the patch level.
Change-Id: I6d1dc1f89f2eed23306760937cc22851534f62f2
1 file changed