Merge "Use SHA_2_256 for importWrappedKey" into android10-tests-dev am: 21a8acac2d am: 77059d37cd

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1201702

Change-Id: I9108adf1820535f65dcf695f37d41438dc272bbd