Merge "Fail early if supplementary info isn't populated" into main am: e181b7430e

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

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