Merge "Add a build-time flag for DICE Changes in AVF" into main am: 7d63a846 am: fab1d5bf

Original change: https://android-review.googlesource.com/c/platform/build/+/2744058



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