Merge "[dice] Adjust the output type of make_sample_bcc_and_cdis()" am: f29985ae57 am: 40301c8bc7

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

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