Merge "Merge "Add android.hardware.security.dice HAL interface." am: b05a7c1376 am: 1d5af3f5ec" into sc-v2-dev-plus-aosp am: 20d510ef74

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

Change-Id: I1c2c6239c7d6d84b8e0f0d030d1b32bb78b11d3e