Merge "Fix for b/404408218 that was not merged in time for the AOSP read-only migration. Add validity checks on DataStore file" into main