Merge upstream changes am: 2b4b898d75 am: 458a5258a8

Original change: https://android-review.googlesource.com/c/platform/external/open-dice/+/2852550

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