Merge "Revert "Add an option to allow/disallow degenerate DICE chains"" into main am: 2b6f390b9b am: fff47de31e

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

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