Merge "Fix validation for truncated keyblobs in ParseOldSoftkeymasterBlob" am: 281c1b81f6 am: cb7bcd1bfa

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2296119

Change-Id: I286e00c9a0bd17d2afc8b5adeaa4864fed28bc18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>