Merge changes from topic "legacy_blob_tests" am: 7de12b5730

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

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