[automerger skipped] Merge "Change ImportWrappedKeyTest back to SHA1" into pie-vts-dev
am: e7300721a0  -s ours

Change-Id: I024dc7437d5d8d3bdf59e2813cccd0ad68b7e084