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

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

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