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

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

Change-Id: Ic00ebe42a30cfa7bff9e229d07f91bb2ec4c3698