Merge upstream changes am: 2b4b898d75 am: 9366c2e73b

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

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