Merge "Enforce fs-verity support for first_api_level >= R"