Merge upstream changes am: c4440e8add am: 3b910a3559 am: fc30075f25

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

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