Merge changes from topic "default_dice_hal" am: 49a1688f5e am: 0b05aae7dc

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

Change-Id: I5a40a95d8ef0dadac167385d1e0331001ce1dd6b