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

Change-Id: Ie8af40cfea7a0893f9f90d4c42a7cf8513e38818