Merge changes from topic "default_dice_hal" am: 49a1688f5e

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

Change-Id: I7f49feb6649e95aee8365fc84a7159246576a43a