Merge "Snap for 6941559 from 513926fc07f451c58e0c346a9c214018eca858fd to androidx-datastore-release" into androidx-datastore-release