Merge "Migrate to new open-dice API for Android" into main