Merge "Revert "Revert "Add an option to allow/disallow degenerate DICE ..."" into main am: d657999e00 am: 18f3e7fcfe

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

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