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

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

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