Merge changes from topic "legacy_blob_tests" am: 7de12b5730 am: c668680e36 am: a456d24679

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2048043

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