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

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

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