Merge "Disable unlocked boot & non-normal DICE test" into main am: eb181a269e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3443419

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