Merge upstream changes am: 2b4b898d75

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

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