Merge "Tweaks for superseded blob processing" into main am: afe371b246

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

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